Added methods and some fixes