Finish entities and added more DB actions