Simplified functions
Added exports to Types module