Moved more methods to 'core' as they are now more generalized.