Simplified helper methods and added extension methods instead