Cleaned up base configuration