CC @armantorkzaban - once #130, #132 is fully implemented - with the improvements to the core #46, #128