Some desing improvements