Fix configuration and helper methods