First changes moving towards cleaner implementation