Changed database relations; added current table; started alignment