Base extensions added, refactored