Fixed getters and setters for top-level functions