Adjust interface: hide unnecessary and make Key constant