Adds support for offset and binary parameters