Refined the Beans and the SQL file