Got rid of overly complicated Api