Fixed imports and aliases not working correctly