Fixed declarations and methods helper methods to provide more accurate intellisense