Added new custom bindings to replace inline calculations