Cleaned Up Common Framework API