TODO: This package should be object operator only